merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 15 Jul 2011 01:34:17 +0000 (10:34 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 15 Jul 2011 01:34:17 +0000 (10:34 +0900)

Trivial merge